separator: Make final

diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
index c6acab5da7338939e57fd19eb308314dae907613..16cde5d510b0a0229053de62e4a2d8a330d0e302 100644 (file)
--- a/gtk/gtkseparator.c
+++ b/gtk/gtkseparator.c
@@ -46,6 +46,17 @@
  * gets one of the .horizontal or .vertical style classes.
  */
 
+typedef struct _GtkSeparatorClass         GtkSeparatorClass;
+
+struct _GtkSeparator
+{
+  GtkWidget parent_instance;
+};
+
+struct _GtkSeparatorClass
+{
+  GtkWidgetClass parent_class;
+};
 
 typedef struct _GtkSeparatorPrivate GtkSeparatorPrivate;
 struct _GtkSeparatorPrivate

diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h
index 1f129c8d0a71d8e50e83fe7c54e847054b2d4878..cdc91ecf6c13f1c25658acd289b91ae083b2ae1c 100644 (file)
--- a/gtk/gtkseparator.h
+++ b/gtk/gtkseparator.h
@@ -37,31 +37,9 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_SEPARATOR                  (gtk_separator_get_type ())
 #define GTK_SEPARATOR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SEPARATOR, GtkSeparator))
-#define GTK_SEPARATOR_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEPARATOR, GtkSeparatorClass))
 #define GTK_IS_SEPARATOR(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SEPARATOR))
-#define GTK_IS_SEPARATOR_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEPARATOR))
-#define GTK_SEPARATOR_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SEPARATOR, GtkSeparatorClass))
-
-
-typedef struct _GtkSeparator              GtkSeparator;
-typedef struct _GtkSeparatorClass         GtkSeparatorClass;
-
-struct _GtkSeparator
-{
-  GtkWidget parent_instance;
-};
-
-struct _GtkSeparatorClass
-{
-  GtkWidgetClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
 
+typedef struct _GtkSeparator GtkSeparator;
 
 GDK_AVAILABLE_IN_ALL
 GType       gtk_separator_get_type (void) G_GNUC_CONST;